Remove temporary hacks for the issue #13441
1 file changed