Revert assault message code, may fix message spam