Moving RVF to be data-source switchable.