Another attempt at fixing hhvm builds.