Let us try this one more time. Revert all changes made to _s up until commit debefa merge until #131 has had a proper code review.