This commit causes problems for vlc, see https://trac.videolan.org/vlc/ticket/5518 This reverts commit 475fb67d0b.
475fb67d0b