I found that the issue 846 fix is unnecessary for this PR, so it is remove now.