* Removed accidentaly slipped in #if 0, we have to fix this properly.