Follow-up on r50351. Fix adding key/value pair.