Split out slaves into their own bucket.
Oops
Simplify.
Merge bug26397