Reversed wrong fix for #1517.