Was this an existing FIXME or did you add this during the refactor?