Revert "Scalable functionality"
16 files changed