I’ve reverted the original changes (as https://www.openstreetmap.org/changeset/155837143) because they were not correct, but am happy to work with you to find a better solution, if you can provide the details above :)