Backed out changeset 882b91ce5a9f, as a relanding of Bug 917226, r=me