Revert "Merge remote-tracking branch 'origin/master' into Cataclysm"

This reverts commit 41984f790f22ec0fc6c37f13c92a49e53a8419f4, reversing
changes made to 5b1812c7fd52a82602b14599d4aa483d94a88d15.