Backed out changeset 2912b402523d (bug 968245) for multiple test failures; CLOSED TREE