Cherry pick https://github.com/ethereum/go-ethereum/pull/26181 Co-authored-by: Charles Cooper <cooper.charles.m@gmail.com>