Revert "REBASEME: Undef all but our MSP tests"

This reverts commit 8aa551ca0d71f12f4804581b3bfd7870a84f6e72.