Fixes https://github.com/flutter/flutter/issues/16346.

See https://github.com/flutter/flutter/issues/16346#issuecomment-380255095 for detailed explanation of what was going wrong before this fix.