PIM-1555 Restoring lost config