Backed out changeset 8526c7a38761 (bug 951354) for CPP unittest bustage