After HDDS-5360 was merged into master, an integration test for block deletion became flaky, as reported in HDDS-5605. This Jira is to revert the change in HDDS-5360 on the ozone-1.2 branch to ensure there are no regressions in block deletion for the 1.2.0 release.