Revert "Old stuff from room."

This reverts commit 821349c9a1fce1386cd05e259d43561449274ba0.
Revert "Revert "Old stuff from room.""

This reverts commit de578d6c63e094fc60329f780bdf4000b1dd2319.