hack removed from here and put in fw.

it will be fixed in fw as soon as I can.