Merge "Revert "Removed old data stack""