There is only one actual change, but it can be a real improvement in some situations.

In practice, since we have a slightly customized scons, we can just cherry pick the one actual change from 2.5.1.