Revert "Fixing crash in empty folders. (Bug 11627191)"

This reverts commit 68b667848ef7c6f69b24a40d780e4088a5f2a1fb.

Change-Id: I51da495d6f8ef98b268c23cce02cce5ef1c7ea00
3 files changed