While it seems the tagging could be improved, it's also clear that in some shape or form the ways can exist in OSM, so reverting to bring the ways back. Further work needed to determine the best way to tag these.