Reverted linking to rooms & events to old style