Backed out changeset 8d6f12da582e (bug 995603) for breakage. a=backout