Try getting rid of __java_return_value.

This may be a questionable change.