Backout f615a0532971:154fb9a9e0bc (bug 493701) for Cpp bustage