Revert "Clean up d2spr"

This reverts commit 00b78944385e2d71d2a8155af48b4317f2511b0e.