Revert 880878 - fix show room/hide