Backed out changeset c1cc52b986f8 (bug 1049258) for breaking non-unified windows builds