Revert "more roomservice bits"

This reverts commit 8978960593f65263c04e17acd9c5ce9ff6c3d557.