Revert "Rename this to possibly fix roomservice"

This reverts commit d56e7040da32c34a2bc5f2fedb46ddd3a4ef888d.

Change-Id: I555943078f03cd19d2dbb70343809c5319d22a80