Undo img workaround, as it did not work out