b23e269ac6
Removes the need to try to create child folders, which simplifies things. (cherry picked from commit f365b53a0fbfb6f4147c688416e101aee9bae7fc)