Revert 36 media manager