reverted 9803 and 9804 like asked

git-svn-id: http://streamboard.de.vu/svn/oscam/trunk@9806 4b0bc96b-bc66-0410-9d44-ebda105a78c1