More desperate changes, to get the 2-layer MapBox maps to work properly.  They don't.