Applied patch to remove the tpie dependency