Switch back to old media variant

Change-Id: I6205c0dd19ddaa37de4c9e5cd1824cd92cbd2170