Commit 8afafa717f5c036595a3a781c63b6be7b478c025 passed CI checks against
an older codebase and accumulated silent conflicts.