Redo https://github.com/Rovastar/openstreetmap-carto/commit/e5320dbd98981fdeb1944771d54d6984b4bf4b73