am 06522ef5: Merge "Remove some commented-out code."

* commit '06522ef517196062299852d59593eba0ea2be3c0':
  Remove some commented-out code.