Revert "Improve upgrade path for managed objects"

This reverts commit 16734e1fb770be58500b2e8fff483938d419744c.