am 9d8721f8: Merge "Remove dead code."

* commit '9d8721f8abb018429e3dba2296bce789b776aa0c':
  Remove dead code.