Reverting r32346. Will do it the correct way and update the patch in Refs #32346