This reverts commit 207a7110ef111633ce9aae7829c19ad7556f62e3. Revert to the last commit so the integration of music player features needs to be done in another way.