Revert the PR lto/64837 fix