Rollback changes and use shelljs