This reverts commit bcba2e25. This change broke a dozen of tests, most of which were fixed. However, it made more clear that we need to re-evaluate if enabling this option by default is a good idea.
