am 5e7f772d: am 6d24e086: Merge "Remove dead code."

* commit '5e7f772dbd27d5d93b15f004991749d321b6d62d':
  Remove dead code.