Addition from 5.10.6 tar ball.