Reapply r121808 now that the missing patterns have been supplied.