Revert "[InstCombine] re-commit r218721 with fix for pr21199"