Issue #2183923 by tim.plunkett: Break the circular dependency in EntityManager.