Change back to scanned map datatype

Dealing with this at the Solr index level is a much more sustainable
way of solving this problem.