Ocv pr 1464 revert