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

This reverts commit 5a447af8db61f2713235c3b86305781aa81b4383, reversing
changes made to 94fcc8c1d74edff5a5bd40958740c09a944535a1.

Revert