Revert "Tweak use-cases"

This reverts commit c143991dba3c821e04ded125058f03af03976b35.
Revert "Revert "Tweak use-cases""

This reverts commit 28918461512e8883a59f4e04f397ca644b0cce99.