Backed out changeset 3a3c05f46c5e (bug 1093611)
Backed out changeset 10a3cbe9e42f (bug 1093611) for w4 test failures