RFR: 8204861 : fix for 8196993 has broken the build on linux

[Srinivas Dama]

Hi,

My earlier fix for https://bugs.openjdk.java.net/browse/JDK-8196993 has broken 
the build on linux.
So I am reverting my fix for now.

Bug : https://bugs.openjdk.java.net/browse/JDK-8204861
webrev: http://cr.openjdk.java.net/~sdama/8204861/webrev.00/

Regards,
Srinivas