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

This reverts commit 9ac37c978ff1d298d3cf7f7d2fa24876a62984a9.