Adapt to removal of fp-vrp.