This reverts commit 3d9017602b. This didn't quite work as I had expected ... While it seemed okay at first, it fails to propagate all the attributes it used to (notably features). I'll revisit this later but reverting for now.
3d9017602b