Backport OV2 mainline patch - Revert hires pixellogic to anomie's version