This time, really fix bug #1081235