I20180727-2000
when launching on a modular JVM" This reverts commit 96369c32121f4eab99beb458982213461d26b0af. Change-Id: I0e31d53f93fb3f9f53347628761c1ed5e6c9b163
when launching on a modular JVM" This reverts commit 96369c32121f4eab99beb458982213461d26b0af. Change-Id: I0e31d53f93fb3f9f53347628761c1ed5e6c9b163