revert jvm changes, seems to be leading to a lot of hard to solve testing problems