Reverted changes to Media class location