General :: Remove Phone Numbers Formatting (dashes)

Me and my trusty G1 have recently moved out of the US. Im running CM's latest, and just like the stock ROM, phone numbers stored in the phone have the xxx-xxx-xxxx US format. This format does not apply to most countries outside of the US. So here when someone calls (or when im trying to add a new contact) phone numbers tend to look weird since phone numbers here have an XX-XXX-XXX format (8 digits total), and so they end up showing as XXX-XXX-XX, which is just confusing.

So in short, is there any way to stop the dashes from showing up in the call log/ caller id/adding new contact form??