Revert "Bring general sketch commits upstream"
Merge pull request #1240 from Project-OSRM/revert-1217-sketch-upstream

Revert "Bring general sketch commits upstream"