Change the remaining occurrences of bug 20455