Nalexander/bug 783312 backport

rnewman: can you look at this and see if the new special folders need special consideration?