Revert "fix roomservice removal"

This reverts commit 2e649f3160831940f0c6fd8d97c4ac97a35166fc.
Derp
Revert "Derp"

This reverts commit 58488168abdbcb88beeba554d11a1d927bbcd446.