Revert commits 20519 and 20523 for now, caused a major issue

git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@20529 ef53c05b-3124-4d59-ae7d-fe3273f42be7