Revert "Merge branch 'origin/master'"

This reverts commit 2be7924781a216171271a6b372759e784d4dd31e, reversing
changes made to 5ee0a6b3576239058df925f8ee54fe87e416a00d.