Log Message:
Simplify (I accidently reverted parts of joergs changes and solve the
same problem differently - undo that now). No visible change.