Revert "fixed generics escaping"

This reverts commit cc3c4d9002b6a9ca05f64f88baeac02957fc0ad1.