Revert "Typo"

This reverts commit 19dbe3197a3a12be9dc45b9a546a127f5bdb0f3d.
Revert "Fixes to RoV."

This reverts commit 04419d46f6f392a16e8e30bdc0bf93bcb11178f4.