Yeah there's a fix for the HHVM issue in https://github.com/facebook/hhvm/pull/2754 so the only change required here would be the regex change.