RFR: 8147931 - Incorrect edits for JDK-8064330

[Rob McKenna]

Apologies folks, managed to overwrite a changeset when pushing 8064330 a 
few minutes ago. Looking to rectify asap:

http://cr.openjdk.java.net/~robm/8147931/webrev.01/
        -Rob