Remove a workaround for fixed issue #20355.
1 file changed