Revert "MSP: Replace shared_ptr usage by standard pointers"

This reverts commit 7312634ee202b9089af4e871d5b685701e6bc74f.
REBASEME
Maybe this works