Backport 2893

Reduceat regression fix.