Revert "sceneswitch"

This reverts commit 17110b44fdc98768e65d9bf979e6ce610c497038.