Scale up -> scale out

Fixes 1339776