Revert "try to generalize"

This reverts commit 33d14baf9cf1e922dd1292dbb67ea34d376c84fc.