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

This reverts commit 549b65378115b85fc4ae8a4fcd2f7040addb405e, reversing
changes made to 14612dab3f141dde852628a0dcc3bfc5c93f9eb8.