Revert "More tweaks"

This reverts commit 9b172d4c05d7c842d3a82cf05844c59bf6169b21.