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

This reverts commit 5eaecc523ff399af223a8be3f7e8c4c5dcaa8dff, reversing
changes made to 1aab9ae5326b8aadae0dbceff8c3c4b64315aa9e.