Revert "x2 speed up for ID3v1 and ID3v2"

This reverts commit abb3fedb50feeed3574ae0fbd1e0620c2ce6a3b1.