Revert "Merge pull request #8 from wluyima/XFRM-120"

This reverts commit 63beeb1893f963ebb2a6141a72893a2ac95efc16, reversing
changes made to 5e331b4beec7d18c53f86bb04865c63515c5cf80.