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

This reverts commit 396847216eca09c27783acc4d469664a1127331d, reversing
changes made to 1831b54759f5460890bf86637ada491375c8883d.