Let's use the variables introduced in r59758 :)