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

This reverts commit ff158e224b3cbf812427b610f51b8ea2d6321cff.