Dealing with bug 25774