Revert r77297, Won't be reverting MimeMagic