(HEVC/RVC) Revert commit 2b89631b25ecc42a5d561a36cfa023673cee3e26 to fix conforming jobs until @kjerbi is back from holiday.