HHH-19392 Reverting commit causing troubles

Revert "fix code in CustomType that didn't make sense"

This reverts commit 3f8ac48.

Author: cigaly

hibernate-core/src/main/java/org/hibernate/type/CustomType.java

@@ -21,6 +21,7 @@
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.ValueExtractor;
 import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.java.JavaTypedExpressible;
 import org.hibernate.type.descriptor.jdbc.JdbcLiteralFormatter;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.internal.UserTypeJavaTypeWrapper;
@@ -100,9 +101,20 @@ public CustomType(UserType<J> userType, String[] registrationKeys, TypeConfigura
 	}
 
 	private JavaType<J> getMappedJavaType(UserType<J> userType) {
-		return userType instanceof UserVersionType<J> userVersionType
-				? new UserTypeVersionJavaTypeWrapper<>( userVersionType )
-				: new UserTypeJavaTypeWrapper<>( userType );
+		if ( userType instanceof JavaType<?> javaType ) {
+			//noinspection unchecked
+			return (JavaType<J>) userType;
+		}
+		else if ( userType instanceof JavaTypedExpressible<?> ) {
+			//noinspection unchecked
+			return ( (JavaTypedExpressible<J>) userType).getExpressibleJavaType();
+		}
+		else if ( userType instanceof UserVersionType<J> userVersionType ) {
+			return new UserTypeVersionJavaTypeWrapper<>( userVersionType );
+		}
+		else {
+			return new UserTypeJavaTypeWrapper<>( userType );
+		}
 	}
 
 	public UserType<J> getUserType() {