This reverts commit d4d48591. I'm reverting most of it but amending or mending a few things that I'm going to move to ns4.
