Added a patch dropped from the previous commit by mistake.