Patch Set 1: I would prefer that you didn't submit this

(1 inline comment)

Great change.

However, I think now the patch does not work with different encoding anymore. Please see my inline comment.