fold the remnants of maps-fault back into maps.c