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

This reverts commit 54a39122b5edf79a18b0d42769ad78f316cc800d.