revert
Merge pull request #37 from duselmann/NSM-227

NSM-227 revert