Backed out changeset a0b233afc099 (bug 1011084) for causing bug 1019827. a=me