Merge pull request #1019 from dart-lang/undo-flatten-conditionals

Revert the change to flatten nested conditionals.