Revert changes made by Auto Releaser Bot

Stan Hurequested to merge
sh-fix-broken-main into main

What does this MR do?

The Auto Releaser Bot introduced several a commit that appears to have reverted some changes that broke main: 38a09b66

This MR reverts 38a09b66.

Edited by Stan Hu

Merge request reports