Fixes #5137 again, squelching namespace issues by renaming over deleting