Merge pull request #2626 from TheBlueMatt/2023-09-revert-2476