Revert "Merge pull request #1744 from 9rnsr/fix11603"

This reverts commit 13b8101061b2e5824c0e0a08654922649acf4978.