RFR 8174157: Backout 8151116

[Anthony Scarpino]

Please review this simple backout.  I pushed using the wrong bug, so I 
need to back this out, so I can push under the correct bug (8173410).

http://cr.openjdk.java.net/~ascarpino/8174157/webrev/
thanks

Tony