Revert "More tweaks"

This reverts commit 3d321101796bf9cb148607e1ff151e441709cded.