Sync with userland variant.

MFC after:	2 weeks