Attempted revert here. https://github.com/flutter/flutter/pull/184455
Attempted revert here. #184455