Reverted Scenes

Hopefully, this fixed the merging conflict from earlier. I reverted to
before my changes were added to the scene.