am 6d24e086: Merge "Remove dead code."

* commit '6d24e0866f61aba0ac3023408ead083ad9b6cdab':
  Remove dead code.