revert multi-msg fix since it has side effects on windows