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

This reverts commit 4b76012681a8e080cfdd5eea1f30323541b49618.