Reprase r271616 comments.

Submitted by:	alc
MFC after:	1 month