Revert r192758 (and r192759), "MC: Better handling of tricky symbol and section names"