Revert "Dsc 805"
Merge pull request #723 from nla/revert-721-dsc-805

Revert "Dsc 805"