Restore <media> fix that went missing in action during last merge