Revert r209049 and r209065, "Add support for combining GEPs across PHI nodes"

It broke clang selfhosting even after r209065.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@209067 91177308-0d34-0410-b5e6-96231b3b80d8