Revert "Fix MotoFM for now"

This reverts commit 359f2dbb268235fb3764481e4de4664072c027f9.