Follow-up r79084: synchronise keys.