Fix brain-dead parts of r11216, specifically: