Fix regression introduced by Bug 1029449 - Bug 1042173