Backed out changeset 6402fb9a21cb (bug 995603) for causing bug 1021815.