am 58b52fb1: Merge "Remove dead code."

* commit '58b52fb133ee4f8a82d3da5c439ca7b9d2caa2bf':
  Remove dead code.