Revert "more roomservice removes"

This reverts commit 3e7ee9648dbdb5a7f2be39187de160737e5f265a.
Revert "Revert "Revert "Revert "Revert "Derp"""""

This reverts commit 768974159e478480846933b929b67609acdcd8e3.