Revert "Merge pull request #9073 from mcirlanaru/bug_828237"

This reverts commit 1ad04796ce64a79c084a6fef1617fd49e43c3bff.