I just ran into the same problem, I've made a patch for the problem (attached). The patch should also fix a minor bug with the checkbox for deciding if you want to skip checkout review.

Discussion of this issue can be found here.