Revert "Fixed apparent type of homomorphic mapped type with non-homomorphic instantiation (#56727)" and add test#57092