BZ-13136 use old directive with new mode