This change appears to be unrelated to the rest of this patch; please remove it and let's discuss it elsewhere.