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

This reverts commit 51105fd728257e983a02e57f3e8f54872c69dfca.