Re-add XHP support