Revert "Merge branch 'upstream-master'"

This reverts commit 61c39f766f075a00351844daa4cec02d8880b007, reversing
changes made to 812b0333e0fb993acff4b62a87637cf72d0fa741.