Really fix bug 454774.