Just wondering - any reason not to just only check `spark.authenticate` here? My concerns is that having this "brute force" might have other unintended consequences and it could be good to narrow the scope of the workaround as much as possible.