why are we re-inventing the wheel? Use JF's

Change-Id: I28df0ebf3f0d0fe3699d0a999fb6def674a4d75c