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

This reverts commit 8420c5dfcf8f2f9081408ec63b469ffa5e9bd2b2, reversing
changes made to 1203447fbf415bc200c012ae2203d98b10e93388.