am 9f2944aa: Merge "Remove dead code."

* commit '9f2944aab0420343dd6e2cbeb3a6e3639e374613':
  Remove dead code.