Revert "Issue 2969"
Merge pull request #1762 from otwcode/revert-752-issue_2969

Revert "Issue 2969"