Attempt to fix hhvm build, take 2