Comment 13 for bug 1022815

@bastafidli - it's not so hard, just follow his words carefully.

Regardless, I've attached the modified version, here. You'll find comments where it was modified.