rooms
Revert "rooms"

This reverts commit e051d058b238fa43a50da290cbf36ebfa16171cf.
Merge remote-tracking branch 'origin/master'