jf: remove duped code  mismerge

Change-Id: I435fbc3e9b0294a33d4591a94dbc6e9f832fa525