Revert "Merge pull request #1878 from balinterdi/patch-2"

This reverts commit bfddc5a1916f3d676a0cd58871857e8faeffea3c, reversing
changes made to 8f1e754bf287edc6f6dfd5a6eadcee5b9548f604.