try to revert code to fix error with Java7 stackmaps only manifesting on Travis, not on my laptop