Revert "Merge pull request #477 from FredericJacobs/master"

This reverts commit 82690274f672ae0eb8fb8f11f8d7c555531b2b9b, reversing
changes made to c79e992e8e64186dfd08e9de21d2675d73555a0d.