Revert "Merge pull request #13875 from gasolin/issue-939011"

This reverts commit 204d32ec1dfa27d87b8ee43ae17b65c005c52b45, reversing
changes made to 97fe3c8a60623821fd0ec265fb11786c3ab50431.
Merge pull request #14681 from gasolin/issue-950082

Revert "Merge pull request #13875 from gasolin/issue-939011"