am 6fadf9e9: Merge "Remove obsolete setkey."

* commit '6fadf9e93913314f2aea3418539f998d47b40d13':
  Remove obsolete setkey.