The data fix was just submitted to cm source and this a build the I just built with it in it. This was built after build 5. Flash over any cm7 build and you shouldn't have to wipe. Wipe if you are coming from cm6.
Credit for the data fix goes to gsarrica on the CM forums.
Download: Download build #7 now.