Revert "Clean up object2.c"

This reverts commit b1815de8a2ddd08493b399ad18527d632bb43a69.