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

This reverts commit 4cc9f45b07dd3cbb1304af7188aef84fb8a21138, reversing
changes made to 314f0679ae54f2cd8e04f7917243ebb92c046078.