revert changes to gdfa to pre-nltk merge-pull