This reverts commit 8e06bf6b. It broke the polly-x86_64-linux-test-suite and aosp-O3-polly-before-vectorizer-unprofitable buildbots.