Revert "Remove Media2Zero"

This reverts commit 52c0464a982bec9aca096d3f569effaf08edccf1.