Another attempt to fix the build.

The previous commit didn't quite fix it.