Revert "Merge pull request #9207 from dumganhar/iss8984-remove-unused"

This reverts commit 97df35f346fe0ea762b0f3fe07336ad4b7222e07, reversing
changes made to be97a306a605d449d2fc1932f28ec1d1a847a73d.