Revert "don't try to be too smart"

This reverts commit 6b055b156b0ee91c90c2de26e6d063c38fc34a8b.
to be continued