Revert "Merge branch 'origin/master'"

This reverts commit d90130d572f68940eaae55f71609275a716d946c, reversing
changes made to 8faa0ed7269396125117b07ffd8c8d388fa6cabe.