This reverts commit f1e7fe8142. This fix is in https://github.com/flutter/packages/pull/39
f1e7fe8142