Relunctantly try cm's JF scheme

Change-Id: Ib3a5af23cd6e4dcbc3f0b6ed41786bedcd92bd96