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

This reverts commit 70e35fd25d55697697c9d63dda8badc54339ce78, reversing
changes made to 014ca68d5c9e85bf46fe81b94a7a4bf23f3f626f.