Revert smaller packate size logic fixes

Looks like I was wrong in commit 43b90e0 and the smaller packet size
logic is correct and does work properly.