Revert r197438 and r197447 until we figure out how to avoid circular dependency at link time