Revert metaprogrammed psnl modules

Too many bugs with ptAttributes, and we're trying to deploy Gehn 16...
Merge branch 'huru/master' into gehn_shard