Revert ea16ce0

The latest build preview of jdk 1.8.0_20 does not exhibit the problem
anymore.

Issue: SPR-11973