Reverted in changesets 130280818 and 130280955; please check the area if there are broken geometries, I had a pretty bad plan for reverting that resulted in a lot of conflicts with new data, I think I solved them all, but it doesn't hurt to check.