Revert 9de997e..9839ead

This rolls back to commit 9de997e995b5f4df20b816e47cfe24d7f49943b5.
Revert back to Media Class