Adjusted to allow for HHVM testing