Revert "Test generic"

This reverts commit 8660de4de40aa448af7961411ab977aca4847f4a.