Revert "reduce Generics-Warnings"

This reverts commit 960258c1e79900d970b6ef115961df1a02c1d660.