Backed out changeset 35603c406f26 (bug 824021) win bc-1 test failures