Revert "Revert "More tweaking""

This reverts commit 0256eb108360ca1d9e9301f2e1717459a0677a56.