Backed out changeset 932f6530318d (bug 1000959) for 603490-1.html asserts