first part looks good, but i don't understand this change and related discussion - why should this be the default behavior? was the other change breaking something?