Potential fix for trac2533149. Testing indicates this will fix all parse errors in android 2.3.4.