Be more careful when passing result to revert()

Instead of passing result as separate keyword argument (which may
lead to strange TypeError exception) we put it to kwargs dict.

Change-Id: I899763e047badeadfd367aa1f06ba4cf6c1b0951