Issue #10864 has been fixed: remove the workaround
1 file changed