am 3d820f2a: Merge "remove dead code."

* commit '3d820f2af24c79515466afc6bdd607ab7dc2bd8c':
  remove dead code.