Issue 7940 by tj: Corrected media protection stuff