Revert "Anton Mitin, 395, MultiFileMap"
Merge pull request #409 from dkomanov/revert-329-MultiFileMap

Revert "Anton Mitin, 395, MultiFileMap"