Revert "Adjust for packet changes in 0.9"

This reverts commit c0989a57f65f0d40d621fcb61be7106a4366dd04.