Simplified Hybrid export to match with upcoming Hybrid 0.14.2 release