What bothers me is this patch appears to be a special case, when it shouldn't be.