(let's try) Revert "Merge branch 'master' into current"

This reverts commit 4b4f1863b66a4c6acf5362766cb1cf5b8d1ac63b, reversing
changes made to 31c159ff818fa662d8a3a89e4d5997cbccd08ea1.