Revert "setting JAVAINCS directly"

This reverts commit b7b86b9ad6f715813d86a99095b8cc1a37cb4d2f.