Fix the folder bug.  The change that had previously fixed this got reverted somehow.

Change-Id: I308656a5b1748e8aca254410b049110afaa7affc
1 file changed