Revert "Output directory update"

This reverts commit e7f8d34fbccbaaf4e2f25cb22819bfb6187caa55.