Revert "Tweaks"

This reverts commit 5ca52eda2753505fdd788763d29acd1e21de1305.