Merge pull request #21363 from mhei/revert-php8-riscv64-workaround