(refactor): Allow EntitiesSync to have a non-faux-activity version of the entity

Is this a bug? Make sure to use the Bug template above and be as detailed in your report as possible.