This should be a separate question from this patch. One issue per patch please. :)