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

This reverts commit 2768b236bce3674197730bf11633862509b37516, reversing
changes made to 43d2ca0cccff48f7015f3ceff14b8cc252fe8b14.