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

This reverts commit 2b18bd344d1b979d23ca07468fd6cc4a44851534.