Revert "More tweaking"

This reverts commit 43971d49e32d538aa33cdfc517b2ffb3aff42cae.