This reverts commit fb9a5307 (rL359398) because it can cause an infinite loop due to opposing combines. llvm-svn: 359695