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

This reverts commit 72c460753a387829cf8a589b03d6660c26301361.