Merge "A better fix for bug 8740202."