Back out 14d1050e721b (bug 940541) for Windows b-c bustage