Restored Leaflet original code, moved hack to map.js