am 8163104b: Merge "Remove dead code."

* commit '8163104b3feb575a321b194a70ecb9873a70b29d':
  Remove dead code.