make this do a different thing for 7 than for 6 for the REST api schema expansion (this is kind of a nightmare)