Reverted last commit

This was required as protected variables were accessed in the room model.