Revert "started a more general approach"

This reverts commit df5b620d386e00b6bc923f6c8724f65a29356b2f.