Better patch format. Check user-modified file for binary-ness, not our stale copy.
Wow I don't believe this actually works