Reverted generic type changes