Revert "roomservice: partially revert"

This reverts commit 31f83ae07ded092c43f012d8727e9991413015c8.

Change-Id: I9c2fe63a509841f21f9b120f0f8a6ae652a99320