Rollback to buggy