am acc0a23a: Merge "Remove dead code."

* commit 'acc0a23a20bf5e5db985661b2c8a8259d9e94498':
  Remove dead code.