Bug 897398 fixed, so unblocked 26317 26979 26980 26982.

Actually the bug was 897398 (typo in the commit).