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

This reverts commit bd580cb436024492a1a31a5d66c1e031776fdef3, reversing
changes made to 57fc03f3e7478c221694d2fa4c3db36d7d4d2299.