This reverts commit 79bb915fb60b2cd220d89e3bb54f67abb8cdb7bd. This caused regressions because SCEV works better with sub.