Revert "tink"

This reverts commit 97321c6b3f3470aa3b69843d0a56793d8d393ba4.
Revert "More tinker"

This reverts commit bb33a3ffbb2a129ba14a32b848dec7be60587146.