Revert "Fixed type parameter substitution bug."

The old behaviour was correct.

This reverts commit c43a501ec4b1684751248b55a057933cf2159abb.