Reverting PR #2007

[thomas-zeng]

Checklist for PR maker

• Have you added a backport label (if needed)? For example, the need-backport-* label. After you backport the PR, the label changes to backported-*.
• Have you updated the changelog? Each package has a CHANGELOG.md file.
• Have you updated or added the documentation for your PR? When you add a new feature, change a property name, or change the behavior of a feature, it's best practice to include related documentation changes in the same PR. If you do add documentation, make sure to add the relevant Graphics Docs team member as a reviewer of the PR. If you are not sure which person to add, see the Docs team contacts sheet.
• Have you added a graphic test for your PR (if needed)? When you add a new feature, or discover a bug that tests don't cover, please add a graphic test.

---

Purpose of this PR

PR 2007 is merged in by mistake. This PR reverts the changes

---

Testing status

Describe what manual/automated tests were performed for this PR

---

Comments to reviewers

Notes for the reviewers you have assigned.

[github-actions]

It appears that you made a non-draft PR!
Please convert your PR to draft (button on the right side of the page)
and cancel any jobs that started on Yamato.
See the PR template for more information.
Thank you!

[Verasl]

LGTM