Backout d2242d05c93c (bug 984783) for Cpp bustage