Revert "g2: Fixup media_profiles"

This reverts commit 89c3c28087aa98e75018a0471684a6573efe8a7b.

Still needs testing and I'm busy :P