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

This reverts commit 1b0022ec9b90881061c7b16b7dafdce86672c8bf, reversing
changes made to 2d268babfb6874a4d33bba02fa0daf91adfceddf.