Revert "Merge branch 'master' into wip"

This reverts commit 5c941f7942c2661fee9b008c7cdcc84e2ea2c5a0, reversing
changes made to 1342abcef9fdc94211c2a75ab9f2ad257227e617.