Unselectable Walls

Squashed and fixed up #4544