On second thought, get rid of commons-collections altogether