bug 1048752 followup - fix for Windows non-unified build. no_r=me, bustage fix