Restore Yubikey setting, lost in fumble-fingered merge