Revert some changes to get back compatibility
Merge pull request #428 from mkc188/master

Revert some changes to get back compatibility