Backed out changeset 07c91b928cd7 (bug 932698) for causing bug 1047618. a=me