Disabled an optimization that was being too enthusiastic. It's not always safe to...