Revert "build: Improve roomservice"

This reverts commit 56f3635f7363c19a8f5647d02b44ff43a95f796b.