Revert "Merge branch 'scene'"

This reverts commit 81bd5476ee96c0c261d90feed50050ef0bfdfb4e, reversing
changes made to b8f9d22396b55f5d37b2a2465864db10d1b249c8.