Issue #19127 Found bug causing the cleanup to never run.