Backed out changeset 24f26d63819a (bug 951354) for CPP unittest bustage a=backout