Revert "Merge pull request #1820 from akalongman/patch-14"

This reverts commit 5243b5ca9d37e41f81bb68619878eed898045331, reversing
changes made to 35fd152630a2ca921299891b4fbc5ad1c369e160.