I sent a patch earlier that had unstaged changes... So I'm sorry if you
tried it but it was broken.

Here's a functional one.