I thought I was already doing that by having the is_using_mongo only check if the module store is XMLModuleStore, and using the mongo path otherwise (thus always preferring mongo if available).  Will that not work?  I assumed it would since the only other options are Mixed and Mongo right?  Adding the config flag sounds good. I'll get that in there.