Revert r210721 as it causes breakage in internal builds (and possibly GDB).