Remove patch again. Will be applied in master differently