Get address_keeper working again.