Speed up folder loading.
Merge pull request #665 from jcushman/dev-folder_speed

Speed up folder loading.