Bring back a needed import, and exclude it from flake checks