Revert "FC-1245 fix errors when files are missing"

This reverts commit a19ed2d5d13fa7448313dca7f6f0b291c856059f.