Going to make some changes to the implementation so I'll revert in the meantime. Reverts flutter/flutter#124337