Revert "Merge branch 'refs/heads/upstream-master'"

This reverts commit dd3e428394b77dc37547e11903f89f44fe0110dd, reversing
changes made to a222e21a2ee38eabdfa7462cf6e63fd331c3823b.