This change is not needed any more :)