Partially reverts the following:
https://www.openstreetmap.org/changeset/173393644
https://www.openstreetmap.org/changeset/173430026
https://www.openstreetmap.org/changeset/173435379

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