Revert "generic"

This reverts commit 418c6d09073e060a0499ba58e742e4d71de26f5f.