Revert worker dispatch change

We'll roll this out separately in a second upgrade.