Good catch.  It wasn't even used actually so I removed it entirely and skipped the cherry pick.