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

This reverts commit 383d98b0c4036a01361809ad0dd4b4460f54701b, reversing
changes made to bb116ed50c06e2c6d7f5e3e6dcc7128b3d8cc90c.