This change broke Polly. I'll track down the failure when I have a chance and re-apply the change.

llvm-svn: 232676