BZ-1061887: Undo the workaround.