am ab9a19e3: Merge "Remove some pointless code."

* commit 'ab9a19e38c685d0cb2952185af510322b26181a7':
  Remove some pointless code.