Issue #5 Rollback previous changes

Signed-off-by:  <adarshakb@gmail.com>