Revert 8e7fb89..29077be

This rolls back to commit 8e7fb89e1f978329adc75e36f0cc2e98b1df87fa.
Everything except stream songs