TestSwarm hasn't been happy since this commit, and everyone deserves to be happy.

This reverts commit 318d47b7.