Remove this patch as it seems to cause problems