Revert "Fixing media stuff again"

This reverts commit af46295a984acf288695744f38262d8cc34c41f8.