Revert "Merge remote-tracking branch 'upstream/master' into unused"

This reverts commit 9fba5bfcfb10994d0b8449b0776656880f52f965, reversing
changes made to e3f618b3f26c080f99c0416e296686f7d3c248f8.