Revert "Merge pull request #3475 from maginatics/master"

This reverts commit 39fa88e3a064f52073483856cbde3b06854f2f6d, reversing
changes made to 8e2f82b49ac797091cd401a5703c23ab085a311b.