Revert "Make setting parent bean faster"

This reverts commit 895ab185914e5765555252ddcac142e8e34455f8.
Revert "Also fixed unset()."

This reverts commit b6fed63defb8090ccb892fea787b8baf9809967a.