Merge "Remove old workaround for HHVM"