Revert "kill roomservice"

This reverts commit 201dc940db71e500af40047bb1746af6743845a2.