Revert "More work on Scene re-write (static registration is messed up now)"

This reverts commit faaa240c50e8face82324d3d6e6342a984aeec1f.