Revert ManagerLayer as a temporary fix