This reverts commit 3fe3946d. The commit violates layering by including a header from Analysis in lib/IR/AutoUpgrade.cpp.