Revert "Merge pull request #35 from dgossow/stable"

This reverts commit f0080080467767b0f408d0c29688a44e0b5aa165, reversing
changes made to 7cdae086e482efbdc87accb2369dd8f1d9bfb049.