Revert "Attempt to fix build on old clang versions"
Revert "Attempt to fix build on old clang versions"

This reverts commit dea60559120ca13536e795d337aff4cf3a81b652.

chouquette/medialibrary,chouquette/medialibrary,chouquette/medialibrary,chouquette/medialibrary