Change status packet skipping to be more spec-compliant. See discussion in