Add workaround for mgd2 schema change