Let's try this with bytes.
Remove left-over TODO.