Revert "DDF-741"
Merge pull request #37 from codice/revert-35-feature/DDF-741

Revert "DDF-741"