Re-wired references to the correct java_stub model (elsewhere)