This looks unused in this patch, so you could slim this patch down by adding it later.