Revert "Move manager.manage(this) up from SU/PG to PC"

This reverts commit 659d5cc74f7801911524321561f6bfa3fe5ad6b7.