Back out a patch that wasn't ready for inclusion. Thanks to OtherBill for pointing out that this was committed when it shouldn't have been.