Remove the workaround for surrogate problems.