Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit e0b654dff08fd4f41e734ff75ec1b327032d9c2c, reversing
changes made to 2b2c2cf3ad4205c9618f9c39aa3393d05651501b.

Conflicts:
	rooms.js