There is different configuration for persist and recover. This change is combining both. Needs revert