Building on the original HHVM fix