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

This reverts commit 511151f0e1aaa4e9741772f56ec6de6c361663a3, reversing
changes made to 54e9aae507e97f6611bca3829658e96fe94e0604.