Restore old make_map behavior