Reverting r171325 & r172363. This was causing a mis-compile on the self-hosted LTO...