Remove USE_MDXFILE def again.  Basically re-applying
d6f0eb961bceed342e72b6f49b21179c6fb1e76c.