Undo a broken part of the recent CoreLabel change
Merge branch 'master' of /u/nlp/git/javanlp