Revert "Merge pull request #477 from obduk/fix_error"
Revert "Merge pull request #477 from obduk/fix_error"

This reverts commit bf9edb9d00d2a7a699c501016d027f3643ff1b8e, reversing
changes made to 97ac8735a4b81cc73f341e9cc10551407f6c8258.

obduk/cms,obduk/cms,obduk/cms,obduk/cms