Revert "Fix mem-alloc for msm"

This reverts commit 402bb32c6da26314156fcf06bafab42b1d45af60.