backport fix to 2-3