Reverting the failed HHVM fix