Add back the MC bits of 126425. Original patch by Nathan Jeffords. I added the