Rather than having increasingly involved workarounds that require other variables to be set. Closes #15822
4184546067