This reverts commit 15da07d6. Because it's not the default. No additional changes are needed in the tests. Closes #40064.