Bug 897239 - Fix regression introduced by bug 873378. a=roc