Revert "Merge pull request #118 from nla/sz-sp25"

This reverts commit af8187adb5102204019efe58adeeacb384382930, reversing
changes made to 4135ddd2a509f994a229e51135baa966d97d9c01.

It broke local development.