Refs #17233 EEA; Removed unneeded upgrade step