e3330b638a
This reverts commit 875a1d61595a90cd62d5d7798f47caa32d297ab4. (this was pushed accidentally, isn't the right patch, and lacks a bug reference)