RFR (S) 8216375: Revert JDK-8145579 after JDK-8076988 is resolved

[Eric Caspole]

Hi everybody,
Could I get reviews on this small change. As Dean suggested, now that 
JDK-8076988 to simplify the trivial method check is done, the change of 
JDK-8145579 is no longer needed, so this webrev reverts it.

This passed tier1 and tier2 testing.
Thanks,
Eric

JBS:
https://bugs.openjdk.java.net/browse/JDK-8216375

Webrev:
http://cr.openjdk.java.net/~ecaspole/JDK-8216375/01/webrev/