Revert "update for new/changed objects"

This reverts commit fed4bf3f88045a0ba78778400504a9f784ebd883.