Revert changes of #10494 from release-8.5 to fix the consistency failure

[JaySon-Huang]

Bug Report

Please answer these questions before submitting your issue. Thanks!

1. Minimal reproduce step (Required)

2. What did you expect to see? (Required)

3. What did you see instead (Required)

As #10510 (comment) described, #10494 introduce consistency failure issue. And the changes was cherry-pick to release-8.5 branch by #10515

4. What is your TiFlash version? (Required)