revert merge lanchon vfp fixes