Revert "Changed to media controller to help syncing"

This reverts commit 72f37567989decba86d0fb146be7f427eb4be5ee.