forked from firka/flutter
This reverts commitf41b3411da, reversing changes made toe33d8d9621. This was a bad check-in due to my mangling uploading a new version of the branch from a different machine. This reverts https://github.com/flutter/flutter/pull/2639 and will be replaced by https://github.com/flutter/flutter/pull/2640