Removed the workaround

Because we are using java the workaround is no longer necessary.