This shouldn't be part of this patch. Please restore this method.