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

This reverts commit 2ec6638fe4512d167023975eda6d4c5270dca4f2.