Revert "Manager update"

This reverts commit 96bb8cce2eec3f7b1c7cc6985507acdb050decb1.