Work around key drops from transient API failures

Band-aid for #370