Revert "Merge pull request #404 from zergu/patch-1"

This reverts commit 5df1067b4e6d03d165c83b761eb78f1fdbf6db1e, reversing
changes made to 58a25ded43c3d04313cad2b738342d307988b1b5.