Revert "Merge pull request #93 from mctep/fix-ns-init"

This reverts commit 3e51bb172d2338156b3d6bd3918d40c68fa143df, reversing
changes made to b098b975dad04711d4576e6e378ff65326fafd62.