Backout changeset e836088f23962b1df1a7bffd86dbbbd8322c4753
Wrap each shovel worker in an intermediate mirrored supervisor