Backed out changeset c284670371cc (bug 899276) for win7 bc failure