Revert "Merge pull request #25 from lissyx/bug1016940"

This reverts commit b7eb7a0203f8fe3659d22ecf650214d55a6d2966, reversing
changes made to 81eab0894a773fc0274b64432f1f49da95d63b7d.