[Issue 8434] Config entry cleanup on Add should be run unconditionally