Apparently there is some functional and naming confusion here. Backing out to re-land after evaluation and possible changes. Tag #863.