Revert "Merge pull request #10764 from mcirlanaru/bug_883269"

This reverts commit b068bef2bfbb759271d4446afa5d4b2207c44ae9, reversing
changes made to 7115b64f7dbf19a909ed8b75af94683903b0c118.