Bug 549861 backout followup, clobber for Windows builds and for tests