Revert older changes and just fix to make Finatra work