Revert "Merge branch 'origin/master'"

This reverts commit ba6fe5a49f5aada87f5ac24c925e3732a806491d, reversing
changes made to 614781b257944b21a088447021af1b394085dc9d.