Revert "HDS #28275"

This reverts commit c105c2ef043b71bde29a6f19a631dad1859a2d82.
refactoring