Backed out changeset 403ab3213879 (bug 893304) for bustage.