Revert "needed by previous commit"

This reverts commit 1519528b1c591f2835cd6ce6af5517345ff70434.
Revert "fix for stock fm app"

This reverts commit 6b065e645061ca1771862f09e31eae070f978ff9.
Revert "Enable FM support"

This reverts commit 8a4979799accedb760f51a87913989899f5d223b.