revert back changes for use-case #93