Unbreak the build.
Merge pull request #947 from dwf/idiot_broke_the_build

Unbreak the build.