Ack, got the room_id specification wrong.

We really need to make this better.

Auditors: ben

Test Plan:
Fingers crossed.