Merge "Revert "Make media command be a shell command""