Revert partial
Revert RV Component changes