@Ocramius I didn't use rebase, but I think I got exactly what you want. There is only one commit in this PR, and it doesn't have any copyright in the file.