I reverted a bunch of changesets that interacted with this construction/proposed via https://www.openstreetmap.org/changeset/134422424

I tried my best not to damage any of your edits in the process, but you may want to give a quick check to make sure this still looks right to you. Feel free to let me know if I broke anything you'd like me to fix.