Restore compatibility with MFR