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

This reverts commit f12ed7fc3de54f4c3cb649446c75e9a2c183b478.