The second part of the build fix for r146702. This should do it.