Drop dependency on commons-text