am 5768ac91: am 5c7039fb: Merge "Remove dead code."

* commit '5768ac917ca0e08a6a356159e0a8837f1bcfc7ff':
  Remove dead code.