Revert "Merge pull request #262 from codingtwinky/master"

This reverts commit bea08a5ac034a86b3205bca4065ad2dd2fd7592a, reversing
changes made to 759b12ee9d8e8843321e9aabf87802ff2747aabb.