Further adjustment for mapserver/mapserver#4717.