Revert "Merge pull request #2213 from kostaad/patch-1" refs #2213

This reverts commit 16bdee388e07a474018d6045d92eccc6f197cdc7, reversing
changes made to 68bf220ed5dc164db9cce04d28f84dcbaef93ee0.