The reason the flag is there just to remind of the refactoring that needs to be done which I think should be a separate user story as it touch clients as well.