Revert two GEP-related InstCombine commits