Revert "Merge pull request #3209 from 9rnsr/fix11939"

This reverts commit 931c72761178a224d44798813ff2667d7fb13e46, reversing
changes made to 3f5d722f6dbca011c60c3282d88ec024d6c06709.

Because it's incorrectly merged change.