Merge "Rejigger the invalid-key checks at backup time"