Revert "Trebuchet : Live folder fixes"

This reverts commit 2a8c7c84a64a9fc9923cfe8447ec4f0b03c5f7a6.