Fixes #6660

Also makes flipping tables block climbing.
Merge pull request #6923 from mwerezak/climbing

Fixes #6660