It's actually weird that this doesn't happen by default. I wonder if this is hurting us elsewhere.