Reverted r19926 based on reports it breaks thin...
Reverted r19926 based on reports it breaks thin...

Reverted r19926 based on reports it breaks things under java7 and on
android. Ticket #2725 patiently awaits a real XML person. No review.


felixmulder/scala,slothspot/scala,martijnhoekstra/scala,lrytz/scala,scala/scala,slothspot/scala,slothspot/scala,scala/scala,lrytz/scala,lrytz/scala,martijnhoekstra/scala,slothspot/scala,shimib/scala,martijnhoekstra/scala,felixmulder/scala,jvican/scala,felixmulder/scala,martijnhoekstra/scala,shimib/scala,slothspot/scala,jvican/scala,jvican/scala,jvican/scala,felixmulder/scala,felixmulder/scala,shimib/scala,felixmulder/scala,martijnhoekstra/scala,shimib/scala,scala/scala,shimib/scala,scala/scala,felixmulder/scala,scala/scala,slothspot/scala,jvican/scala,scala/scala,slothspot/scala,shimib/scala,lrytz/scala,martijnhoekstra/scala,jvican/scala,lrytz/scala,jvican/scala,lrytz/scala