Revert "Rework?"

This reverts commit 15e97b39bce5ccc3220fb36eaec78ea35ee7d479.