Merge pull request #13 from dart-lang/normalize_rollbacks

Normalize rollbacks.