Backout bug 1044456 / changeset c6cea1a53ccc due to test failures CLOSED TREE