For now, the default setting for this optimization is now 'off' until a better solution is implemented. That means 4.7.0 is likely to have this off; the better solution does not look to be a simple point change.
The change is now in the development builds from job 363. Andy