Revert "Always lookup before registering objects"

This reverts commit 3245a760a08d4a022a5234e36db880d6fdbedd45.