+1 for defaulting to legacy behavior when an optimization feature is added.