Reverts the fix from #3582883 in favor of something that targets the specific problem reported
Closes #3589165