Recommit of 'Enable rooms...'