revert PR 7930
remove unused module
remove unused property; cleanup comment
Merge pull request #10163 from adobe/randy/revert-7930

Revert #7930