Revert "Merge branch 'leaflet'"

This reverts commit c1dbe26c980ee8339532539db3e37723a7d191f7, reversing
changes made to cee4cba700c2f3c8680113b1e656cbaf9dad5e11.