revert some of the previous changes to focus changes on term definition