Complete MFC of r270233, also unbreak the build.

Reported by:	grehan