Revert back to using a ObjectManager