Reuse the same checks two times, make difference minimal.
(cherry picked from commit 72d81c47)
This will create a new commit in order to revert the existing changes.
