Revert "Merge remote-tracking branch 'glorf/acrobatics'"

This reverts commit 089ef7a2a02d62c1bdaf3fa0fda470189f5182bb, reversing
changes made to 67422c397c883017b4ff6a7adfb405cdf767f807.