This reverts commit ae385400. As well as some follow-up test fixes. The original change causes new-pass-manager.ll to fail when polly is enabled.