Back out ebc291b18b35:eaf6e83e80fe (bug 946532) for non-unified Windows bustage
CLOSED TREE