Patch Set 4: I would prefer that you didn't submit this

(1 inline comment)

Reorderd the change not to depend anymore on change #4345. If the commit message is updated (and maybe the testmethod is renamed) then we can accept it.