Revert "Merge branch 'master' into new-build"

This reverts commit 3a3d9d0647c7a7d2476236cca332426f0f36ae3d, reversing
changes made to 1b2c5c83b2dc2b60a380a7be040ab5c10ab87499.