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

This reverts commit 4188cd0e136eba55491d2e57c2a63a3aa7dff818.