Revert "[ConstantFold] Avoid creation of undesirable binop"

This reverts commit 673a4671.

Depends on reverted commit 0cab8d20.

That commit was reverted due to an LTO crash. I've put a reduced
test case here: https://github.com/llvm/llvm-project/issues/64114