This reverts r192484, which I really shouldn't have checked in. Apologies.