Rollback fix

No comment