This reverts commit 1970e82b0d, reversing changes made to e882660ea6. The reparenting logic is still bogus, but I'll figure out how to deal with that in a bit.
1970e82b0d
e882660ea6