Removed dependency to lf-infra.