Reverted r198807, r198808, as they cause link errors in configure builds. Will look at this later. llvm-svn: 198832 GitOrigin-RevId: 73f7b0273efabfb414d14d2c68cfb70b808ba34a