Revert "Use TomTom:SetCustomMFWaypoint for Carbonite.  Try not to stomp on existing waypoints."

This reverts commit 3379929934574c989d1739f000d86b0c430c01dc.