Revert r33911 for now -- causes fatal error death with OggHandler at least.