Revert integration to initialize manager instances with thread based factories