Fix broken build.

It's all system admin, all the time, here at scala ranch.
Merge pull request #1968 from paulp/pr/fixbuild

Fix broken build.