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

This reverts commit 33f1c1ca0d4753241b4fabca2de0e6a476e8049a, reversing
changes made to fe088600ea681fc77b34343f75c500a5c5e0c9af.