Revert "Honour 'use-external-names' in FileManager"

Revert r202442, which broke the buildbots.