[MC] Revert part of my previous change, I was a bit overzealous.

A change to test the previous commit will be coming soon.