am 5c7039fb: Merge "Remove dead code."

* commit '5c7039fb069c040759df0a5a15241dd7f8b2f9b7':
  Remove dead code.