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

This reverts commit 44d3241fc5a7171fb7f3b5ba57c8baf9a9f0a983, reversing
changes made to 9fe418fc135e4a025876a552399e1aca98d8394d.