Revert "a bit more cleanup for SPC-690"

This reverts commit fe5023896312ef8c0804972590a629a1c800fb18.