SI-8367 revert SI-8192's change to primaryConstructor when isJavaDefined

this is some weird stuff