This reverts commit 928ee00d.

This causes further regressions when building libavcodec. So revert this
partial fix for now.