I already cherry-picked it to the other branches.

@cupakromer -- did you figure out your issue?  I definitely saw this fail when I used it...