This is now done for authn handlers affected by this pull