Revert "TEST"

This reverts commit b9d8951be3ab9da8b6ac17e334b9437106266209.
Revert "Update for support roomservice"

This reverts commit 518f3920c676d2a7bffeb12774c6ca7a2ab233da.