Backed out changeset e807ddf2965f (bug 688852) for test bustage