MFS10 r273057
MFC r272324
Fix a missed merge introduced in r272883

Approved by:	re@ (gjb)
Sponsored by:	Multiplay