This reverts commit c2d5303192. It causes serious performance problems in densely mapped areas.
c2d5303192