am d2e4a166: Merge "Remove dead path code"

* commit 'd2e4a166ebae4dcf0a9d6cb186283739443b0803':
  Remove dead path code