Revert "Merge pull request #10611 from es92/music2-squashed"

This reverts commit 16c6bd66d7685fdc8abd2d841243a3ca69413bb9, reversing
changes made to 14367fe868af13c63548d57fd1e2dea0134e65fa.
Merge pull request #10613 from davidflanagan/revert-music2

Revert "Merge pull request #10611 from es92/music2-squashed"