Media settings
Removed fix due to upstream patch