Submitted by: Volker Stolz <stolz@i2.informatik.rwth-aachen.de> Reroll source file and also remove a patch.