Revert "Some Packet class rewrites."

This reverts commit bdcebcc89ad44ed62ebbbeff0404ea9c88445ba2.
We found our standard :)