Remove workaround from branch for optimize_module crash