am 4beeee87: Revert "Remove support for duplicate file entries."

* commit '4beeee879af7581d6b3c28246a7cebe608f8e3a0':
  Revert "Remove support for duplicate file entries."