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

This reverts commit f46e498e08d9e9dd17b600e545e509d6ce77e53c, reversing
changes made to f192d4f874b455d2419d1c726086b11312b39e1e.