Updated to correspond to latest bugzilla patch (bug 979594)