Simplify the patch further.