Provide JWTs even when id_tokens are used

This reverts the change in behavior introduced in 16.0 where using id_tokens makes it so that JWTs aren't provided anymore.

Not intended to be merged.