Merge "Revert "Enable new data stack by default""