Revert r273860. It breaks IPSEC in tunnel mode and needs more revisions to
be merged before it will work as expected.