Revert "Tweaks"

This reverts commit 7ad9827098ac929fde4d8174f68b44eb03f24b24.