Temporarily revert r192749 as it is causing problems for LTO and
requires a more in depth change to the IR structure.