Revert "Revert "Revert "more roomservice bits"""

This reverts commit 1a7676381e4df5712363bfcceffdbbfee7e905f1.