794924e8a9
This reverts commit 938847bea9.
This didn't turn out to work well enough, so let's avoid unhelpful indirection.