Revert "Merge pull request #231 from lx1988cyk/patch-4"

This reverts commit 0a9b0d6b6144c1e29d37924e289fb80d6d85fab4, reversing
changes made to 5f5880b6491b2b98dac968dda8525316b61a00ec.

This merge should have been made on development - not master.