Revert "Merge pull request #2643 from infograf768/32883-master"

This reverts commit a01e4706117373f4e9c68e6e33f58e2cec3b9d26, reversing
changes made to 21161aa95829c8abb11646ebbb9e537a2bfdaf12.