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

* commit '8382b0d3c6639ee0eeadec02983bfceaf5ba0a32':
  Remove some pointless code.