This provides better backwards compatibility following refs #28377. Backport of 03974d81220ffd237754a82c77913799dd5909a4 from master
This provides better backwards compatibility following refs #28377. Backport of 03974d81220ffd237754a82c77913799dd5909a4 from master