Revert "Merge pull request #47 from eea/2.2.x"

This reverts commit 248419e4b9b0623d7a713dd0ba5ebad2e91ba64b, reversing
changes made to 7870630240eb66117c2c64bdd3d3533b012a2678.