This reverts commit 0724cf1b. Reverting as it contains changes to openstreetmap.dgml that are supposed to be their own commit.