Updated fix for HHVM.