
This reverts commit 98c509fecbf1f41450f95605348e9e074180bbd8. Part of reverting PR #24803 on branch `6.0.x`, because that PR is a follow-up to PR #19904, which was only merged into master. PR Close #24809
This reverts commit 98c509fecbf1f41450f95605348e9e074180bbd8. Part of reverting PR #24803 on branch `6.0.x`, because that PR is a follow-up to PR #19904, which was only merged into master. PR Close #24809