8187482: Backout JDK-8159377

Reviewed-by: shshahma
15 files changed