Revert "Merge pull request #1 from d-eff/test"

This reverts commit cddec2c3649f2ff23f706a229c1dbe34fd15690b, reversing
changes made to 7d988c4e065ed0d166fb0121cc7145c054c592d2.