Fix over-zealous delete from a previous commit and rework logic to fit with upgrade script. Refs #2186. Refs #1497
Fix over-zealous delete from a previous commit and rework logic to fit with upgrade script. Refs #2186. Refs #1497