My goodness, I just found out that I mistakenly committed (and
submitted) some extra code with the patch.

Here's the fixed version of it.

- Artyom