Rollback, removes rest-client requirement