Merge pull request #1638 from 9rnsr/fix10357

Remove workaround for issue 10357