Revert "Merge remote-tracking branch 'radar/2-2-stable' into 2-2-stable"

This reverts commit 3d7d2b0049bfee4330985ef3ae65342f4584a4cb, reversing
changes made to 0db901094c2dac8773ebfec875e16d95907af313.