Regen.

This is a direct commit to stable/10 instead of a MFC of
r271494.

Approved by:	re (gjb)