Revert "Merge pull request #134 from elpendor/unstable"

This reverts commit 896e0f460b6438081320301aa5b76f7000274f2e, reversing
changes made to 56b5127200035f4d9c4f897babd515dc94ae5e40.