Revert two GEP-related InstCombine commits

This reverts commit r216523 and r216598; people have reported
regressions.