Revert "Tweaks"

This reverts commit f8933fd0cb5db240e4bddd005a2e0fe231287b59.