You're probably right, I will close this PR and let the discussion flow in #10467.