Seemed a bit pointless considering the pending merge of these two classes. It's even more necessary now we're stopping the entrypoints before killing the workers.