Revert r261014. Let Kevin fix it.

MFC after:	1 week