Revert "Back to non scalable"

This reverts commit 2a4e385e0a9a8cbb6c81f8903776f7e103204391.