This reverts commit 9968896c. This commit seems to cause the build failures of main.
mentioned in commit 42910da5
mentioned in commit 924ea3bb