Revert "Merge pull request #310 from roidelapluie/master"

This reverts commit 9fc93e285c7f13817a8f22aebaccb6e5e7d2da40, reversing
changes made to 30bf838065928872adbecc979eb67265b8560253.