Achim Gratz <Stromeko@nexgo.de> writes:
> Well, all this "manual reverting" messed up master quite royally.  I
> haven't checked maint, but things might be a bit easier there.  I'm
> currently trying to re-trace what master and maint should have been and
> make a patch on top of the mangled versions...

Here are two patches to clean up master and maint to where they should
be (IMHO, please check).  Needless to say, you _will_ have to do another
release with these fixes.