Revert "Merge pull request #6298 from Rivet-the-Zombie/stone-walls"

Nice one.