Revert "Experimenting with media again"

This reverts commit b04febb2a6a83fd3ff17749d9e2e28f0a1001e9c.