Reverted trunk again. We might want to find a way to delete these revisions again (x3n's changes are still available as diff in the commit mails).