Again, I'd like to limit the scope of this patch to the issue at hand.