refs #7351 Reverting commits related to #7454