[REV] Revert changes for duplication of cost method bcoz it is fixed in master.