Revert "Merge branch 'origin/master'"

This reverts commit 3dd7575c02d0aed13526e0adac9097d408b08754, reversing
changes made to 219f704ec7ef340c0990fc48124ba0b7ae64ef17.