Revert "Revert "Allow more cores""

This reverts commit e927b962ae4a07bb77ee970075436d56ce364e62.