I could go either way. Unless there are objections, we could backport without the tuple3 fix.