Backed out changeset 6442a3773f2a and 400c4131858e (bug 1070127) on a CLOSED TREE