partly undo com_finder

affect 9d53b7a2ff82e66ba5ad820aa6947a16fa8d46fe and
0f10dedd933702ade3ec3f518b5d668d18306046
remove 2.5 update crap