Roll back 16364004 and 16206027.

Review URL: https://codereview.chromium.org//16387004

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@23625 260f80e4-7a28-3924-810f-c04153c831b5
5 files changed