jf: extractororored

Change-Id: Ia1d22e35e798586eb2aed4cef51db5af1cf64451