v1.18: Revert PRs caused hash mismatch (backport of #35018)

[mergify]

This is an automatic backport of pull request #35018 done by Mergify.
Cherry-pick of 1542392 has failed:

On branch mergify/bp/v1.18/pr-35018
Your branch is up to date with 'origin/v1.18'.

You are currently cherry-picking commit 15423928c1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/src/fee.rs

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of df2ee12 has failed:

On branch mergify/bp/v1.18/pr-35018
Your branch is ahead of 'origin/v1.18' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit df2ee120e9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/src/fee.rs

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 0dcac3f has failed:

On branch mergify/bp/v1.18/pr-35018
Your branch is ahead of 'origin/v1.18' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0dcac3fe7c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   runtime/src/bank.rs
	modified:   runtime/src/bank/tests.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/src/fee.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio refresh will re-evaluate the rules
• @Mergifyio rebase will rebase this PR on its base branch
• @Mergifyio update will merge the base branch into this PR
• @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (ed34e4b) 81.6% compared to head (992761d) 81.6%.

Additional details and impacted files

@@            Coverage Diff            @@
##            v1.18   #35020     +/-   ##
=========================================
- Coverage    81.6%    81.6%   -0.1%     
=========================================
  Files         828      828             
  Lines      224059   224061      +2     
=========================================
- Hits       182947   182923     -24     
- Misses      41112    41138     +26