Revert "--patch"

This reverts commit 7f00ad1652e9b1c3186630eed2a930d4248fb11a.
Revert "Revert "--patch""

This reverts commit bb4bf57709e0fbc15a378c10a5abaae02f4040e2.