Revert "Merge pull request #7 from sion65/master"

This reverts commit 0950439645dd5444ee6be6050f14e1cfd72879bd, reversing
changes made to 995dcadaf8fb9955da3ed007545bae482313908a.

The ip_id update by sion65 doesn't work with the changes that Ole has made, We will revisit the ip_id after we get Ole's changes in. My mistake in not merging in the right order.