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

This reverts commit 0cd08437923bbf7f1fa4991da343d9ad33dbd695.