Revert "Manually revert https://jira.kuali.org/browse/KULRICE-6725 - seems unnecessary and has some impact on Finalizer queue"

This reverts commit 284c58b3c70dd62674eb3a47cafb23b3a4d8796a.