am 5a44bdc8: am 8382b0d3: am ab9a19e3: Merge "Remove some pointless code."

* commit '5a44bdc828cba61aa055e2d71b3af62f39100179':
  Remove some pointless code.