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

This reverts commit ae6c7e98a88d11be4cb7669a61f1aebbabb55db9, reversing
changes made to 1d6e38e727be62e09d8047ea7648521eca145e5c.