am 8e501b90: Merge "Remove dead code."

* commit '8e501b90006e3d01c4641d5fc024c96448a2695c':
  Remove dead code.