Revert "Use messageRoom"

This reverts commit cfdad660d2ed1d51768235de42cc39f081ed3e6e.