Oops. Forgot to remove a fixme before committing.