Back out r160101 and instead implement a dag combine to recover from instcombine...