Reverted r17792, which caused unexpected Window...
Reverted r17792, which caused unexpected Window...

Reverted r17792, which caused unexpected Windows build failures in
certain configurations.


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