Seems like this patch is not needed any more