revert-Drop_workaround_for_unit_tests.patch
