Revert "[jaiguru] report-folder patch"

This reverts commit 1b36c737956bdc06ffee0d35fc361afb7eeb05f1.