Revert "Change file load timing"
Merge pull request #156 from magnars/revert-152-master

Revert "Change file load timing"