I think it'd be good to get one last release candidate out with the
change from #2292 to ensure that's not going to cause any unanticipated
issues prior to a final release