Revert "issue 692 chnages"

This reverts commit 4970ae69da1699848a36fe1729175111e7c98ad2.