Bring by rf12 code back to show the diff.

@jcw to review.