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

This reverts commit 4e4d0d76f1e89c1dc4a3c2d940dd612c27dbff0e.