I guess this doesn't need to be part of this patch.
I've modified the patch and merged to master. I haven't found a way create new patchset in this pull request.