undid changes for 1027
Merge pull request #10 from Rise-Vision/chore/undo-1027-fix

Undid changes for 1027