Fine, I'm sending here 2 patches:

For revert the previous commits: