Revert r1151. I didn't intend to commit that.