Reverted r198807, r198808, as they cause link errors in configure builds. Will look at this later.