Enable keyring (fix bad merge for 75eddcf502d2)