Revert "refs #33512"
Merge pull request #518 from aipocom/revert-516-bugfix/findbugs-ToDoSelectData

Revert "refs #33512"