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

This reverts commit 70fe90a19c4457a1e0f950ff238232d6d32698da, reversing
changes made to bdce8addc6a401d42a94704b42cee623ced3c0b6.