I've reverted Steffens changes until further notice.
I have to look in the changes.. sorry for including them so fast.
I am in Beijing right now, so I'll look into it as soon as I am back home.
@steffen: Sorry for reverting the changes. Lets talk about it as soon as I am back (should be in one week or so
)