Revert definitions to map_type 1