Revert "Revert "Replacement with files from server""

This reverts commit 69019bb03c1e59b89e5878e553c5ac782e780fe6.