Fix race in r267221.

MFC after:	2 weeks