Revert portions of b8877b86a91f879504971eac920703ff1abed7e7 for shoutcast and ettv
code.  I'll deal with this all at once later.