Patch from Mamba to eliminate preg_replace /e
Cleanup to remove references to Xmf_*