Revert "Merge pull request #975 from dannymidnight/stable"

This reverts commit af1892be9b3a7a37bf81a1ccffc2bb9f76ff61c0, reversing
changes made to 587c2e505088501fabe4458be55a905f6a5f2f27.