Revert commit 68ba4fd7 - it breaks local file access...