Fixes #4721: cleanup for pull request #4703
Merge pull request #4790 from adobe/dangoor/4703-cleanup

Fixes #4721: cleanup for pull request #4703