Revert "spm"

This reverts commit 1207110c4b7c8318233f23ebdd9d1e7c71cb3aca.