Revert "[MMS] Henge Guardian"

This reverts commit b4c210e5fe6eb456618e076eda58199fab0107dc.
Revert "Revert "[MMS] Henge Guardian""

This reverts commit 3e00eebaf9ad145142b0a76f232850d8008e2b9b.