Revert r178166. According to Howard, this code is actually ok.