Let's add a bit more verbiage here... something like:

    This code should be merged into the harness before long, and when that happens, we should
    get rid of this and use their version.