am 5d22a5b5: Merge "Remove dead code."

* commit '5d22a5b5ecfd9fce5084915e65e114c8541c084c':
  Remove dead code.