optimize packet ordering (partial revert)