Changes here and down are part of this patch.