Cleanup from issue #15831
Merge pull request #15865 from techhat/issue15831

Cleanup from issue #15831