Revert latest KML addition, a better implementation is coming up in a future release