Partially reverts the following:
https://www.openstreetmap.org/changeset/173245428
https://www.openstreetmap.org/changeset/173251709
https://www.openstreetmap.org/changeset/173253115
https://www.openstreetmap.org/changeset/173294075
https://www.openstreetmap.org/changeset/173297770
https://www.openstreetmap.org/changeset/173337846
https://www.openstreetmap.org/changeset/173346676
https://www.openstreetmap.org/changeset/173347247

See comments on https://www.openstreetmap.org/changeset/173297770 for background.