Backed out changeset a00bd379adb2 (bug 950371) for build failures; CLOSED TREE