Revert "Avoid more copying in the propagation of the directory. The test_cluster_group unit test is currently messed up, need to fix that later."

This reverts commit c43163e3774e1d9a7019dfb493c527f9b76dba22.