Revert "Try trimming even more"

This reverts commit ebf61b0337380c2f6a7155361da2a3210ad2a457.