Hmmm, this smells like a hack. Why does core/ need to worry about query module at all? Shouldn't we move any indexing configuration to the query module? Just like we've moved submodule configurations to each individual module, i.e. cache stores...etc.