Backed out changeset e6126e815061 (bug 992486) windows bustage