From Andrew Feren (bug 2462):