back out test force_push; start populating combine_mapfiles