Backout bug 979445 due to clang build failures. CLOSED TREE