Back out d39b5acb8d83 and cf778a07299d (bug 847120) for Windows build bustage