Replace hack for gis_layer_shapefile*