Remove workaround for issue 10357

Because the root compiler issue 9665 has been fixed.
Merge pull request #1638 from 9rnsr/fix10357

Remove workaround for issue 10357