Removed work arround

Bug is not in the part  where the workarround was placed