Temporarily reverting r56683. This is causing a failure during the build of llvm...