Without this PR and #4163, you will get a black screen when trying to play back a Hi10P file. Try it, it's that way ever since #845. Fixing the black screen was the whole point of #4163, but I accidentally disabled too much. This one corrects the "too much" part.